From 6e89856cc0c237d1be3e66adcb3a866b79b77c6e Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 2 Jul 2014 17:27:12 +0200 Subject: [PATCH] Adwaita: fix popover buttons. Unfortunatelly labels doesn't change color wrt states. See https://bugzilla.gnome.org/show_bug.cgi?id=732494 --- gtk/resources/theme/Adwaita/_common.scss | 42 ++++++------------- .../theme/Adwaita/gtk-contained-dark.css | 37 +++++++--------- gtk/resources/theme/Adwaita/gtk-contained.css | 37 +++++++--------- 3 files changed, 40 insertions(+), 76 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 4c46853378..296ae99ce6 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -382,39 +382,18 @@ GtkLabel { background-color: transparent; background-image: none; box-shadow: inset 0 1px transparentize(white,1); + text-shadow: none; + icon-shadow: none; } /* menu buttons */ -.menuitem.button { - color: $fg_color; - background-color: transparent; - background-image: none; - border-color: transparent; - border-image: none; - border-style: none; - box-shadow: none; - &:insensitive, - &:active:insensitive { - @extend .menuitem.button; // override generic .button:* - } - &:active { - color: $selected_fg_color; - text-shadow: none; - icon-shadow: none; - } - &:backdrop, - &:hover:backdrop, - &:insensitive:backdrop, - &:active:insensitive:backdrop, - &:active:backdrop, - &:active:hover:backdrop, - &:active:selected:backdrop { - text-shadow: none; - icon-shadow: none; - color: $insensitive_fg_color; - background-image: linear-gradient(to bottom, $bg_color); - border: none; - box-shadow: none; +.menuitem.button.flat { + @extend %undecorated_button; + outline-offset: -1px; + &:hover { background-color: mix($fg_color,$bg_color,10%); } + &:selected { @extend %selected_items; } + &:backdrop, &:backdrop:hover { + @extend %undecorated_button; } } @@ -1323,6 +1302,9 @@ $asset_suffix: if($variant=='dark', '-dark', ''); &:inconsistent { -gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic'); } + &:backdrop, &:backdrop:hover { + color: transparentize($backdrop_fg_color,0.9); + } } //treeview & selection mode icon view diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index e647124b6a..998518876b 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -537,32 +537,19 @@ border-radius: 3px; border-style: solid; } -.button.flat, .button.flat:backdrop, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, GtkCalendar.button, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover { +.button.flat, .button.flat:backdrop, .menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, GtkCalendar.button, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover { border-color: transparent; background-color: transparent; background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + icon-shadow: none; } /* menu buttons */ -.menuitem.button, .menuitem.button:insensitive, .menuitem.button:active:insensitive { - color: #eeeeec; - background-color: transparent; - background-image: none; - border-color: transparent; - border-image: none; - border-style: none; - box-shadow: none; } - .menuitem.button:active { - color: white; - text-shadow: none; - icon-shadow: none; } - .menuitem.button:backdrop, .menuitem.button:backdrop:active:insensitive, .menuitem.button:hover:backdrop, .menuitem.button:insensitive:backdrop, .menuitem.button:active:insensitive:backdrop, .menuitem.button:active:backdrop, .menuitem.button:active:hover:backdrop, .menuitem.button:active:selected:backdrop { - text-shadow: none; - icon-shadow: none; - color: #939695; - background-image: linear-gradient(to bottom, #393f3f); - border: none; - box-shadow: none; } +.menuitem.button.flat { + outline-offset: -1px; } + .menuitem.button.flat:hover { + background-color: #4b5050; } GtkColorButton.button { padding: 4px; } @@ -1597,6 +1584,8 @@ GtkSwitch { color: transparent; } .menuitem.check:inconsistent { -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } + .menuitem.check:backdrop, .menuitem.check:backdrop:hover { + color: rgba(201, 203, 201, 0.1); } .view.check { color: rgba(238, 238, 236, 0.1); @@ -1749,6 +1738,8 @@ GtkSwitch { color: transparent; } .menuitem.radio:inconsistent { -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } + .menuitem.radio:backdrop, .menuitem.radio:backdrop:hover { + color: rgba(201, 203, 201, 0.1); } .view.radio { color: rgba(238, 238, 236, 0.1); @@ -2251,11 +2242,11 @@ GtkLevelBar.vertical { .level-bar.fill-block.empty-fill-block:backdrop { border-color: rgba(201, 203, 201, 0.15); } -.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkLabel:backdrop:selected, .entry:selected, .entry:selected:focus { +.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkLabel:backdrop:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { background-color: #215d9c; color: white; outline-color: rgba(255, 255, 255, 0.3); } - .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected { + .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected { color: #2c2c2c; } /********** diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index e1b1dce867..da9dd26213 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -537,32 +537,19 @@ border-radius: 3px; border-style: solid; } -.button.flat, .button.flat:backdrop, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, GtkCalendar.button, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover { +.button.flat, .button.flat:backdrop, .menuitem.button.flat, .menuitem.button.flat:backdrop, .menuitem.button.flat:backdrop:hover, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, GtkCalendar.button, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover { border-color: transparent; background-color: transparent; background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0); } + box-shadow: inset 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + icon-shadow: none; } /* menu buttons */ -.menuitem.button, .menuitem.button:insensitive, .menuitem.button:active:insensitive { - color: #2e3436; - background-color: transparent; - background-image: none; - border-color: transparent; - border-image: none; - border-style: none; - box-shadow: none; } - .menuitem.button:active { - color: white; - text-shadow: none; - icon-shadow: none; } - .menuitem.button:backdrop, .menuitem.button:backdrop:active:insensitive, .menuitem.button:hover:backdrop, .menuitem.button:insensitive:backdrop, .menuitem.button:active:insensitive:backdrop, .menuitem.button:active:backdrop, .menuitem.button:active:hover:backdrop, .menuitem.button:active:selected:backdrop { - text-shadow: none; - icon-shadow: none; - color: #8d9091; - background-image: linear-gradient(to bottom, #ededed); - border: none; - box-shadow: none; } +.menuitem.button.flat { + outline-offset: -1px; } + .menuitem.button.flat:hover { + background-color: #d9dada; } GtkColorButton.button { padding: 4px; } @@ -1596,6 +1583,8 @@ GtkSwitch { color: transparent; } .menuitem.check:inconsistent { -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); } + .menuitem.check:backdrop, .menuitem.check:backdrop:hover { + color: rgba(84, 89, 90, 0.1); } .view.check { color: rgba(46, 52, 54, 0.1); @@ -1748,6 +1737,8 @@ GtkSwitch { color: transparent; } .menuitem.radio:inconsistent { -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } + .menuitem.radio:backdrop, .menuitem.radio:backdrop:hover { + color: rgba(84, 89, 90, 0.1); } .view.radio { color: rgba(46, 52, 54, 0.1); @@ -2249,11 +2240,11 @@ GtkLevelBar.vertical { .level-bar.fill-block.empty-fill-block:backdrop { border-color: rgba(84, 89, 90, 0.15); } -.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkLabel:backdrop:selected, .entry:selected, .entry:selected:focus { +.view:selected, .view:selected:focus, .view:selected:hover, GtkLabel:selected, GtkLabel:selected:focus, GtkLabel:selected:hover, GtkLabel:backdrop:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected { background-color: #4a90d9; color: white; outline-color: rgba(255, 255, 255, 0.3); } - .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected { + .view:backdrop:selected, GtkLabel:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected { color: #fcfcfc; } /********** -- 2.30.2